bitkeeper revision 1.1159.45.8 (4125bdd65AGH_yEQnU1cGd31tL8SuA)

Add a timeout to blkif connect.

diff --git a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c
index e28274a4578371f8e2b8fd10c1ca2a109d0810bc..7a50b14fb29f480f46a5c539e4e20544a9dd50ec 100644 (file)
--- a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -1215,12 +1215,15 @@ int __init xlblk_init(void)
      * for notifications before proceeding. For now we assume that we
      * will be notified of exactly one interface.
      */
-    while ( blkif_state != BLKIF_STATE_CONNECTED )
+    for ( i=0; (blkif_state != BLKIF_STATE_CONNECTED) && (i < 10*HZ); i++ )
     {
         set_current_state(TASK_INTERRUPTIBLE);
         schedule_timeout(1);
     }
 
+    if (blkif_state != BLKIF_STATE_CONNECTED)
+        printk(KERN_INFO "Timeout connecting block device driver!\n");
+
     return 0;
 }